Repository navigation
chore(pstack): sync upstream pstack (cursor/plugins#628..#634) - #19
Merged
Merged
Conversation
Merges upstream@f713f14 (cursor/plugins pstack@f713f14203cd). Also records upstream@b5fd060 as a parent via `git merge -s ours`, because #18 was squash-merged and dropped it from main's ancestry. Upstream commits merged: - #628 /ketchup explains changes with embedded screenshots, videos, diagrams - #633 restate attack-the-premise, fix-root-causes, make-operations-idempotent, test-behavior-not-implementation as reasoning; sync summaries and /correct - #634 cut marginal sections from interrogate lead-judgment, swarm, type-system-discipline, migrate-callers-then-delete-legacy-apis Conflicts: - README.md: kept the port's README (upstream's principles table, "not shipped here", automations sections are Cursor-only). - docs/guide/08-principles.md: stays deleted; its edits mirror the principle summaries already merged into poteto-mode/SKILL.md. - ketchup: took upstream; "`/visualize` chart" stays "a chart from the visual tool". - attack-the-premise: took upstream; links rewritten to ./principle-x.md. - type-system-discipline: took upstream's cut; kept the port's **principle-x** naming. Inherited from upstream, left as-is to stay in parity (worth raising upstream): migrate-callers body is now one orphan bullet; type-system description still promises "illegal states" and "exhaust variants" whose bullets were cut; swarm still says "N workers" and "the table" after their antecedents were cut. - swarm: took upstream's cut of the intro line and step 3; kept the port's step 4 unchanged (upstream did not edit it). Step numbering follows upstream (2, 4, 5) so the next sync merges cleanly. Tested: - bun scripts/check-port.ts: 0 findings - bun test ./scripts/check-port.test.ts: 82 pass - bun test orch watch-pr: 61 pass on 14 of 15 runs; first run reported 53 tests and 1 error, not reproduced since. No script changes in this diff. - claude plugin validate .: passed (expected root CLAUDE.md warning) - claude -p smoke checks: NOT run, nested CLI hit its usage limit. Merge with `gh pr merge --merge`, never squash or rebase: a squash drops `upstream` from main's ancestry and the next sync re-conflicts.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges upstream@f713f14 (cursor/plugins pstack@f713f14203cd) into the port.
Merge this with
gh pr merge --merge. Do not squash or rebase. #18 was squash-merged, which droppedupstream@b5fd060from main's ancestry. This branch puts it back with a no-contentgit merge -s ours b5fd060commit. Squashing this PR would drop it again, and the next sync would re-conflict on lines already resolved.Upstream changes
/ketchupexplains changes with embedded screenshots and videos, and draws diagrams only where a picture beats words. Action items are now plain bullets./correctstep 3.Conflicts
README.md: kept the port's own README.docs/guide/08-principles.md: stays deleted./visualizechart" is translated to "a chart from the visual tool"../principle-x.md.Pre-PR gate (interrogate, opus + sonnet)
-s ourscommit changes no tree content.Tested
bun scripts/check-port.ts: 0 findingsbun test ./scripts/check-port.test.ts: 82 passbun test orch watch-pr: 61 pass on 14 of 15 runs. The first run reported 1 error that hasn't reproduced since. No script changes here.claude plugin validate .: passed, with the expected root CLAUDE.md warningclaude -p --plugin-dir .smoke checks, because the nested CLI hit its usage limit.